add unwrap method in baseService.scala
add changes from subtree development
add changes from subtree development