Added distribution management to core module