Removed backwards-compatibility