Sorted out some internal dependencies