ADDED code changes and Object stores