Changes to set correct attributes and correct run order for recipes