Add self properly