Add feature and obstacle functionality