Slight changes to make it easier to develop with.