added model complete, cleaned up schema