Updated to be more composer-able