Removed check for empty? on several attributes.