Dataset layout improvements