Add some methods. Still some FIXME has remained.