Parser and migration improvements