Remove hardcoded id & Fixes #53