#25 implemented additional support entities to try and work out what is going on with Query Designer not working.