Implemented function calls
Fixed function return constraint