Simplified Mapping functions

Adds dependencies to ISheet