Updated init method to take some overrides