Feature/rest actions