Added module and embed functionality