Improving plugins system.