Feature/pick module