updated M.Application to support undefined CB