Added suggestion for paginator
Refactored ResourceManagerFactory
Fixed filename typo