Changes to make this easily usable in irb