Closes #114: Function representation changed