Temporary commit (2): now migrating to DynamoDB based