Added interface + few bagfix