Added basic description support