[OLINGO-438] Added better  support