Added description support + few fixes