Add procimap support