Add import declarations for issue 313 & 314