Major refactor to support new extension methods
Fixed func helper to work