Added better leaves support :)