It is hoped the legislation will be in place by April