Add more entities basic support. Add support for field selector