Replace hack with new featured functionality
Slightly better author syntax