Updated to prepare for migration to AWS