Make types slightly clearer