Support decl formats

Resolved #46 
Resolved #47