Merge DAO module back into webapp