Better organisation for dataTil