Added basic actions support