Repaired to reflect AsajzCore changes