Some refactory into DAO