Updates to allow embedded resources to be added