added isDefault and isActive properties