Added function value and function type value classes