Refactored native models merged into iPad version