Started using better way of handling objects