Remove generics
readd generics with new url