Refactor to profile inheritance