Updated model structure. New structure required formatting to be compatible with mapper.