Reorganized Core to allow for multiqueue usage