Improve composability