Add strict checks