Reorganize methods from database