Refactored ClientEJB