(#11) Performance: updated infrastructure
Merge branch 'feature/11-update-infrastructure'

* feature/11-update-infrastructure:
  (#11) Performance: updated infrastructure