Capstone: reworked data loading