Proper use Java persistence (fix #13)