[A-SGW] Simple refactoring. Added columns count field