Adding generic and endpoint support