Reworked properties