Web: change contract
Web: removed useless abstraction