Base set of changes for Functional Interface related intro