Re-order import statements
Add parsing for boolean values