Minor Refactoring
Refactoring
Added PreInitialize and PostInitialize Hooks in Entity