Feature/aws factor