Adding in raw support and fixing alk