Added support for timestamps into matrix controller