Refactoring and bug fixes. Now binding 24 data types.