Add solver and heartbeat skeletons