Add support for other properties besides type.