Add SLAVE_TYPES
More stuff