Added simple type-check