#52 - Add lists support in overrides
Refactor