Replace array with Object for speed