Domain model improvement and ability to update toggle works now