Moving proxy here
Added stub