Fixed: Remove schema check