Add implementation of required methods