Add proper initialization.