Bring back proper dependencies