Add security, fix controllers