Added classes (version to 0.2)