Christoph Gritschenberger:
	- rewrite to support multiple addons