Added API & resolve dependencies