added modelmap support