Added cleaner helper functions for dependencies