Inline methods restored to .h