Actions refactoring. Added skip of self question