DATAREST-414: Hack the structure