Customer related contribs and enhancements