Less hacky
Added dev handler without caching