Added status remodeling for AWS components