Added isActive field