Few changes for backward compatibility