Cleaned up new backwards compatibility handling