Refactoring.
Merge remote-tracking branch 'origin/back-end-working' into back-end-working
Workaround to support other environments.