Few Changes

Changes based on code-review. 
Tests still missing and also not updated the schema.

pinging @rjmackay