Use wrapper functions where possible
Replace hardcoded slug paths with correct BP wrapper functions