Added partial and fill tokens
1.8.0