Updated: Use interface segregation principle

@lol768 would be proud.