Initial implementation with exact type matching