Fixed dependency and upgraded