improving template in aj-core