Added client-side helpers and merged the schema and the models