Removed grouping on contructor