Included some missing library exports