Adding require and TODO features