Improve organization handling
Release 0.2.1