Use more common initialization pattern