Feature/refine active state