Some methods made private
Fixed force initialization