Dependency fix

Makes it more container agnostic. Is there a definition for a single dependency that I don't know about? Don't really like to use int64_t
Why do you not use wstring anymore here?