Template related services moved to helper
JavaDoc added