Updated init() method