Yeah I was thinking that as well as I was copying and pasting from ec2, there should probably be an ec2_common or something in core for this.