Add first working version of mapping for Q006