Apex - Made changes to init