Starting Note class
Extending entity factory
Adding database service alias
Merging updates from master