Added matrix related classes from team member