Try to split out properties that dont belong in Search and BPMessage etc.