Extend types

Untested