Fix specs + Refactor some interfaces