Further improve fixed size datasets