Added dependency script
Mapping bug fixes