Back-end refactoring cont.