Adds missing interfaces, and changes previous interfaces to be consistent