Few modifications for refactoring