Added noise classes (to be implemented later)