Make more things properties