Add find by id for Android
Start moving find by id to server