Add persistence support
Split into webapp and ejb