Removed dependency on CommonFunctions
clarify limitations