Retrieve v1 feauture

With (more) cleaned code