Resolved demo imports