@crypt0gnome: adding more support