Adding full tomEE support (v1.6.0)