added class functions in schema and fixed broken import