Plugin framework added