Refactors soy implementation