made heartbeat token repository and content type sensitive