Starting fix functional classes