Add missing methods / make more consistent