More massaging to work with backend