Implemented field logic and some architect changes