Making changes to work with R# extension