Reson: Further classes will be added in the next step. Change-Id: I9dba8c1fca11cbc51fa11edebabde4687d17e312