Added properties to interfaces + added enum