all mapping types working now