Bedrock overhauled for Gulp