Removed unneeded code and supports new parameter specifications