Incorporated some changes to raw input (i.e. groups for Properties)