Add flexibility on topic add;