Add groovy null safe traversal and use of extension methods