Removed hard coded types