Support for more props