Topic /

Improve flexibility