This is not pretty, also not very DRY :D
We need to figure out what to do with this - Couldn't it be grabbed from includeMap perhaps?