Objectified the classes, added security measures and more