Fixed bugs
Added crud plan