Corresponding function name is available now when stopped at breakpoint
Also some utility functions have been moved to separate file