Added basic charm functionality