Added tracker and note classes