Update MapMark and AwsBasic to support images