Added new components, fixed concats with plugins