Added function type and completed convenience headers