Removed intermediate class
bump to 0.5.141