Fix Jboss 7.1.3 issue, use separate interfaces instead of generics