Added support to Generic Relations