Added more manager stuff