Removed queue implementation and added a custom class