Changed the setup with the ejbs