Updates to enable embed