Editting Queue to use interface