Architectrure recreated
Added and implemented interfaces