Improved multi result mapping

Improved multi result mapping. Also updating to EntityFramework 6.0