Reworked plugin registration and extended variable substitution