#1494

Would be really neat to make the data part of a facade as well