Modifications additions on Plugin exports/imports