add EBS volumes and snapshots + new layouts