added core app and fixed missing imports