Added argument to specify type to eliminate sub-type