lazy add some more goodies, next time should be JSON