Fixes interface, still lacking verifications