Changed how props are read