Constructor modification for easier use