Bank package Refactor