Added some descriptive typing