Update main Controller, use some useful classes