Allowing function data object clickers

Change-Id: I01ce7cf96dfffb5e05fa10ddc3c63dbdd653c708