[REFACTOR] - simplified interface and jpa implementation.