Features/query access

more changes