Option to manage properties by table

Also changed all options to use 'expires' rather than expiry in some cases.