Player, Builder & DAO fixed