Updated 3Tier to include all necessary inputs