Removed check for unsupported arguments