Moved dependencies on StorageHandler to MessagePropertyBuilder