Add more shims and update README