Use the new jackson mapper
Move daos