Separate resolver