Refactor
Fixed missing method
Fixes
Refactor