Added DataHandlerFactory. Removed device symbols