Updated templated and backend to use catalogue table