Fixed api
Fixed adm