Add missing @Override annotations
Switch to auto-generated persistence interface with swing data