Change to using hash layout