Will be done later on in the scoe of https://enyojs.atlassian.net/browse/ENYO-2221