Simplified API, ensured feasibility.
Adapted implementation basically, must fix CDI injection again.