5.3.0 Add base for parsing