made changes to Model to follow a more SQL friendly scheme

- also made corresponding changes in Calendar Activity