Added proper initialization