Move guard to core_dependencies