Add EJB2 support - kudos to Tom for fixing my attempt