Scaffold now better adapt to new Sharkbone conventions