Refactored app spec