Added types and declarations