Refactored project to generic picker