Made the Function API even more elegant