Added simple traits support