Updated sources with new architecture