Reworked components actions