Update dax_manager

Working on dax_manager