Restored backwards compatibility