Updated init method