Added initialization functions