Change add bank functionality and some refactoring