Changed initialize methods to take options hash.