i03txx: Code refactoring to database redesign