Add init and finish functionality