Added interface an class support