Abstract command reworked