NULL defaults and UML class diagram
Added missing null defaults