Edited constructor