Pattern finder fix + Cube storage update