Added descriptor, fixes on main flow