Remove dependency to AbstractOptions