Update to support (:struct ..) notation, exclusions