Related to #5. Added conververters