Closed #1 (BaseQuery renamed to BaseQueryHandler).
Closed #2 (Support for custom Entity id generation).