fixed up schema and utils