Improved types generation for TS