Added server compatibility

Also organized imports