Refactored stuff into drawer service