Make constructor optional, add init