+ TODO: solve templates issues