Added resolvePaths functionality'