Took care of unchecked generics :-(
Removed todo - can be done via an interceptor