Added skeletons for core and wa