Clened up BO and DAO classes