Added override and explicit return types on some method