Bank related changes and refactoring