Refactored naming and added restart option