Modify to work with EAP 6.1
Fix variable lookups