Data layout slightly improved