Removed factory in favor of containing information directly in messages