Fixed atomic dependency, improve api.