Refactor to remove Execute and use a generic identifier