Cleaned up scheme management