Added custom org template expansions