Use defaults instead of extending

Closes #286.