Added resolver for finish