moved options defaulter to core