Added proper constructor