Added back some backward compatibility. Todo work on deprecations