Adjusted to framework updates