Feature/aws customize consumer layer queue map