Added resolve support