Added temporary ddl, needs fixing properly