Updated version of Fineco module