Used Uibinder which is a huge improvement, and a better management for SQL files upgraded