Making schema more adequate