Refactoring done; added hardcoded config