Adding all FE & BE functionality