Add support for props