Backward compatibility with AWS