Initial support to show functions added
Conflict resolved