Removed crud
refactor to support 3rd party topic managers