Update and replace manual DAO with Deltaspike data