Expand plugin and changes around how canvas is inited.