Addition Work to Core App