Merge "Add additional checks for attributes"