Added DRYer yaml based format