better use of data contexts, no more ../.. nonsense