Feature/modernize pies