Fix dependency error
Add macro to get simpler syntax