Moving code to BLL and etc.. (Storage part)