Added master-detail example in defensive-building, some minor improvments