Updated: for Cedar stack