Moved some props to file