WIP: Extracted more condition checks to dict.