added isActive property