Updated isActive() and setActive()