Removed final (CDI...)