Adapted skeleton to work with latest framework changes