More scaffolding and offline libraries