Refactored van spec