WIP: Added support for EC2 in configuration