Better API hierarchy. Some ideas for the first Psychic