Merge pull request #6 from carlosrusso/feature_performance_refactor

Feature performance refactor
Merge pull request #8 from carlosrusso/master

[SERVDEV-39] Major refactoring that lead to performance improvements