Improve Flexibility

Improve Flexibility