Added support for default schemes and sorting