Enhancement: Cleanup Magic API