Refactored props to properties