Added additional apis - almost done
Updated schema
Cleanup