Refactored to move resource based functionality to infrastructure context ansd provide initial support for JEE