Edited some interfaces, and generated some empty classes