Add "import" keyword and remove "rva" and "regexp"