Fixed a bug with the wrong Key + started to simplify / refactor the API