Updated a few interfaces accordingly