Added options defaulting