Moved EJB and Jaxrs support to separate annotations