Add developed code from fccp project