Thank you! It has always really annoyed me that this code was not in a DAO.