Fix - Style: Adding type kit support