Add custom keys handling.
Merge branch 'master' of github.com:alehkot/collector-api