Moved dependencies from raw