Constructor Modification