Added default values. Added some dirty tracking.