Initial commit - moved MAP into own extension