Created finance fee collection table and code refactor