Extended DB schema and working templates