Fixed access mode parsing and added externals