Feature/owner macro