Fix expression snippet and adds extends snippet