Change how defaults are handled
Update docs