Several changes and refactoring