Move additional methods
Update documentations