Some changes to getting properties