Added proper types