v0.003 Added classes