Controller moved to common. Some fixes.