Start improving the functions model