Changes to be used in #92