Language implementation refactor