missed these classes last commit

Adding missing classes @fcduarte