Added picker configuration
More TODOs