Changes to fit documentation