Resolved backwards compatibility issues