Add proper dependency handling modules