Version 2.1: Add legacy compatibility <2.5.1

Fixing problems exposed in issue #2