Added support for nested plugin and template sources