#18 Commonize Decl