Fixes and Enhancements to REST and Generics API

Signed-off-by: Reinaldo Penno <rapenno@gmail.com>