Added base class and moved reading