Update default handling
Cleanup and change attribute names