Optimised data fetching (fixes #29)