Additional API call with graaspeu. Bugs and code refactoring