Initialized collection in their definitions.
Added hack to initialize null collections.