Feature/efficient compose