Reduced magic dependencies to one