Props support and React version fix