Added floating point support