Made ready for cloud deployment