[v.1.6.0] Added backward compatibility + fix for the active class