Added default values where necessary