preparing to move mapping defs into main pattern class to reduce
duplication