Add classes for other AWS environments