DEVIDM-92 - Moved aspects to the server