improving templayed support