Adding Java EE 6 Support