Fixed mutation, hashKeys and smaller file size