Added ButtonManager