Instance instead of static
ClientAbstract updates
Major refactor