Add Brandon's changes, introduced DAO implements