Added overrides and slave capabilities