Re-implemented loading dependancies