Adding more features to schema.