Removed some default values