Issue/34

Updated schema properties