Fixed some usages of the old architecture