Bugs fixes
+ factory base enriched by several abstract methods