Get rid of members as an engine
Remove generic template