Add extend support

Closes #3