Tried to support previous versions