New files mainly for manera mock