use standard conventions rather than synthetic
add more indices to loader