Removed final for enabling inclusion with CDI later.