Add reference to columns for controlfn func etc
Change visibility for other column references