Re-added proper dependencies