Splitted up storage class in partial classes for better readability